Fix startup hang on GNU/kFreeBSD.

diff --git a/debian/changelog b/debian/changelog
index bf46db3e30f3b6203033007ba7b245cb72c52532..6171138801295e5fa72c8c444e76d572a417d608 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,7 +31,12 @@ emacs23 (23.2+1-3) unstable; urgency=low
     <svenjoac@gmx.de>, and thanks to Stéphane Glondu
     <glondu@debian.org> for the 23.2+1-2.1 NMU.
 
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 11 Aug 2010 22:39:23 -0500
+  * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff).
+    Thanks to antoine beaupre <anarcat@anarcat.ath.cx> for the report
+    and Petr Salinger <Petr.Salinger@seznam.cz> for the patch.
+    (closes: #559392)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 11 Aug 2010 23:13:12 -0500
 
 emacs23 (23.2+1-2) unstable; urgency=low
 

diff --git a/debian/patches/fix-gnu-kfreebsd-startup.diff b/debian/patches/fix-gnu-kfreebsd-startup.diff
new file mode 100644 (file)
index 0000000..233c190
--- /dev/null
+++ b/debian/patches/fix-gnu-kfreebsd-startup.diff
@@ -0,0 +1,20 @@
+* Emacs should no longer hang on startup on Debian GNU/kFreeBSD.
+  Patch: fix-gnu-kfreebsd-startup.diff
+  Date: Thu Aug 12 04:21:09 UTC 2010
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Provided-By: Petr Salinger <Petr.Salinger@seznam.cz>
+  Bug: 559392
+  Status: new
+
+diff --git a/src/s/gnu-kfreebsd.h b/src/s/gnu-kfreebsd.h
+index a1e8c02..89563de 100644
+--- a/src/s/gnu-kfreebsd.h
++++ b/src/s/gnu-kfreebsd.h
+@@ -7,2 +7,7 @@
+
++#undef INTERRUPT_INPUT
++#define BROKEN_SIGIO
++#define BROKEN_SIGURG
++#define BROKEN_SIGPOLL
++
+ #define NO_TERMIO               /* use only <termios.h> */

diff --git a/debian/patches/series b/debian/patches/series
index 695c4e86b261de749b9f300870ddedc50b0b2edc..e8a55fbcff66227365811369e09eb39838213ac1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ version-mention-debian.diff
 look-for-news-to-find-etc.diff
 fix-flymake-xmlstarlet-invocation.diff
 add-unix-to-cpp-undefs.diff
+fix-gnu-kfreebsd-startup.diff